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