Merge commit '98ec69ac121d1db903a28ec735b6eeef5ed64174' into upstream-merge