Revert "Revert "Revert "Merge commit 'a5f9c21cc04b70b4bc9771cc944760653377ab5a' into kk-4.4.x"""

This reverts commit b5df73992913249cb2d91fbd364a556ad968dbb1.