Merge commit '95274a40' into manualmerge