teaching_edit: fix bugs
Merge commit 'github/testing' into beta