fixes #5679 - change CR identifier to name to fix has_many association lookup
Merge remote branch 'origin/develop' into develop