Merge commit 'e260e580' into manualmerge