Merge commit '9538749118d47dfcd3ed45804736027d87ec054e' into upstream-merge