Merge commit '94ba87c9' into manualmerge