Merge commit 'ddced198cdb6e3c9f7d8b612fa1d22c51c36fa4a' into upstream-merge