Merge branch 'MDL-70384-main_take2' of https://github.com/lucaboesch/moodle