Merge branch 'MDL-78391-master' of https://github.com/HuongNV13/moodle