follow core 465 Migrate from StateBlock to StateDerived