Merge [50997], [51120], [51171], [51210], [51253], [51311], [51337], [51400], [51410], [51413] from the trunk