Merge commit '09c9f0830cadfe0d44624ecb9953e7f453a7503d' into rebase-r293584