Merge branch 'sf2'