Merge commit '75b10c43365e2a9cab5398f31b96a463b0d57eff' into upstream-merge