Merge branch 'confprec'