Merge commit 'f711df67d611e4762966a249742a5f7499e19f99' into upstream-merge