[PATCHv2 0/4] Add support for replicators which loses context on clock removal