Merge commit '04095e5ff305fc25a214b52e005153af9d009d66' into upstream-merge