#1169: standardise CLI cycle points
Merge pull request #1174 from benfitzpatrick/1169.standardise_cli_cycle_points

#1169: standardise CLI cycle points