Merge branch 'MDL-64749' of https://github.com/mkassaei/moodle