Merge commit '2a2af967b0bc601c9b450c72b95104e67222e5b2' into upstream-merge