Merge branch 'MDL-69690-400' of https://github.com/ilyatregubov/moodle into MOODLE_40...