fixed issue in remove and add
Merge remote-tracking branch 'origin/new_ecs_impl' into new_ecs_impl