Merge commit '92a16d7a9a904d5dd55d012b89ad798f0e4cd0bd' into upstream-merge