Tweak Cycle indexing
Fix issue 10845
Cycle unittests
Merge pull request #1851 from monarchdodra/cycleMod

Fixes in Cycle