Merge commit 'e32605062cd62c2a958ad28a6ad7de4eeab12027' into upstream-merge