Merge "Clock and padding updates" into sc-dev