Merge commit 'e9283f8b88eb6054ac032f3d9b773e80d842c0cf' into upstream-merge