Merge branch 'MDL-72656-main' of https://github.com/sarjona/moodle