Merge commit '3a330134b3effa3494051763b38f12a24715d53a' into upstream-merge