Merge branch 'singlepopt' into single