Merge branch 'MDL-78370-main' of https://github.com/junpataleta/moodle