Add changes to the clients which use APVCyclePhaseProducerFromL1TS