For this branch we should only receive a FlashHash (only during transition period) or Hash. I still need to update 3.0 with 3.x specific changes.