Merge branch 'MDL-74822-401' of https://github.com/HuongNV13/moodle into MOODLE_401_S...