Merge commit '8919b945' into manualmerge