Merge branch 'MDL-80244-main' of https://github.com/roland04/moodle