Merge branch 'cherry-pick-2617c2bb' into 'releases/3.5'

Merge branch 'feature/test-lecture-timeouts' into 'master'

See merge request !184
1 job for releases/3.5