Merge "Clocks! - More updates" into sc-dev