Update from kk2.7-stable