Merge branches 'clks' and 'pnx' into devel