Restored feature step for groups and contexts