Merge branch 'MDL-79863-patch' of https://github.com/ilyatregubov/moodle