Merge remote-tracking branch 'origin/liana/edu-tests'