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

This reverts commit 92175b802ab11e53dcf8d9be913b5a51cd69be67.