Replace CycleBuilder
with PartialCycle
#1169
+209
−156
Merged