Merge commit '608911acac53f08dfaaf1878f56d4e32ee572ce4' into upstream-merge