merge kk4.4