Merge branch 'jc/safe-c-l-d'