Merge branch 'MDL-73228' of https://github.com/call-learning/moodle