Merge "Implement new clock wait functions"