Merge commit '38c75be3139a117b02350dbda9d48d47aa57fa3d' into upstream-merge