That's the plan. In any case hive engine update can only happen once fork is confirmed and stable. And then this change isn't really dependent on the fork.