Merge branch 'MDL-80839-main' of https://github.com/aanabit/moodle