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