Merge commit '1d03689e5357d66172c35b2ff550a0fa5d2a36d1' into next-merge-temp