Merge commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4' into upstream-merge