add cm branch changes to omni branch