BUG-5626: refactor BehaviorStateHolder