Merge commit '2474ebe8' into manualmerge