Merge commit '7267c0947d7e8ae5dff7bafd932c3bc285f43e5c' into upstream-merge