Merge commit 'b0293e54af32bcf08f4b4e5b4b472534de343972' into upstream-merge