Merge commit 'c9159fe9aa9abe24115ea4d16127179e9cb07e22' into upstream-merge