Merge branch 'MDL-80087_main' of https://github.com/PhilippImhof/moodle