r32 modify merge [ver 1.4.1]