Backported AP tick code from live release