CMS-3693 CycleButton behavior changes