Migration to sf2.3