Merge commit 'b4ae3cfa57b8c1bdbbd7b7d420971e9171203ade' into upstream-merge