Merge "Convert cycles to mcycles" into sc-dev