Merge branch 'MDL-74096-311' of https://github.com/ilyatregubov/moodle into MOODLE_31...