merge [4121/branches/1.0], refs #1024