Merge commit '6e23063c469c0d90d14b376a696d87149e2a1aa4' into upstream-merge