Merge branch 'dev/cleanup-clocks' into for-next