cleanup
merge [3581/branches/0.11]