Merge branch 'MDL-74977-main' of https://github.com/HuongNV13/moodle