Merge branch 'develop' into academy-lms-fixes