Merge commit '3e94a9a19db2eb0cc8388b77a12f0025e6af39f0' into kk-4.4