merge [3974/branches/1.0], refs #986 and #982