Merge branch 'singlesw' into single