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