Tweak Cycle indexing
Fix issue 10845
Cycle unittests