Merge commit '5a4d701acde890a5ca134236424ece45545f70c7' into upstream-merge