Merge commit 'fe0d4d3f7769d5b024e8166fc075148f9cf76ba9' into upstream-merge