Merge branch 'f-fix-merge-referenced-by' into 'dev'

ENH: Better errors for identifiables.yaml and when record type does not exist

See merge request !173