Merge branch 'MDL-81480-main' of https://github.com/meirzamoodle/moodle