changes for sf 2.2.0