Merge commit 'a7b15a5cc6261629879d4d8a71bacf23f983000b' into upstream-merge