Merge commit 'e7b45cc4467f9bbae46acdc8d21ceb2a16d63b50' into upstream-merge