Move callbacks
Merge branch 'move-callbacks' into staging