Merge branch 'singlereplace' into single