Merge commit '8847cfe8aa9d8f6b8648aafd5d929a57d836cc61' into upstream-merge