Merge commit '22890ab5e825601f4c3d5a1a6b4197904e5d1fee' into upstream-merge