Merge commit '14015304b662e8f8ccce46c5a6927af6a14c510b' into upstream-merge