Merge remote-tracking branch 'github/kk4.4' into slim-master