Merge "Large clock positioning" into sc-dev