Merge branch 'MDL-70094-310' of https://github.com/SangNguyen2601/moodle into MOODLE_...