[FIX] Preliminary fix for passing og context in generated crons
[IMP] Make sure we can support two deliveries in one day