merge post-1.3.0 fixes