Merge branch 'MDL-49897' of https://github.com/rushi963/moodle