AMEC-2131 - changes per Pilar review
Merge branch 'dev-orcid-integration' into dev-moodle-room