Merge branch 'MDL-69414' of https://github.com/nadavkav/moodle