Merge commit 'b834b5081d6266cc0789454905f3b7d622d4d096' into upstream-merge