Merge commit '0a70ec8e' into manualmerge