Merge commit 'a36a344dcd5c778cc0417df36c5aa8f95c5497c3' into upstream-merge