Merged in clock-build so as to have a single order