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