Merge branch 'MDL-81489' of https://github.com/lostrogit/moodle into main