Modification for SMF 2.0.X and SMF 2.1.X branches