Merge commit '4a7e1190dfadf1154721125af8510347f8a3c56b' into upstream-merge