Merge commit 'f471a17e9d869df3c6573f7ec02c4725676d6f3a' into upstream-merge