Merge commit 'b3dbb9546ade0108156a04b4983cd3057fd77563' into upstream-merge