Merge branches 'core' and 'clks' into devel