Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle