Merge with Sf2.5 init