Merge commit '71093711589dafcb920dc3bc9bb811eaf8b14101' into upstream-merge