Merge branch 'MDL-80553-main' of https://github.com/ferranrecio/moodle