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