Merge [ver 2.6.6]