o:Merge some missing changes from fms simplification