Merge commit '4513d9232badcc5039d69dae946054ba2682c258' into upstream-merge