Merge branch 'late/clksrc' into late/cleanup