merge [4198/branches/1.0_], refs #1033