BUG-5626: refactor BehaviorStateHolder

No match.