Merge commit '8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0' into upstream-merge