Merge commit '9ed7b059ef776a3921cfd085e891f45076922542' into upstream-merge