Merge branch 'MDL-81298-main' of https://github.com/vithushau/moodle