merge from kk_2.7rb_1.28