FEATURE/state-manager-sort