Merge commit '19e65b47f60c68d7e8c96aa0a36223c5a0d3422b' into upstream-merge