Merge commit '42bc608b2a144dfa5141dd6ba5d12cb97ac804a7' into upstream-merge