Revert "Revert "Merge remote-tracking branch 'upstream/kk4.4-caf' into berserk""

This reverts commit fcbf1bff7d4b76fa9964c9502673c132dc103973.