Merge branch 'singlensswrap' into single