Merge commit 'f7cbc08ff0d712b0febcf84ce8458c3ae30db4fa' into upstream-merge