Merge [#368] for 1.7.0 release