Merge branch 'develop' into assessment_permissions