Fix export school assignment
Merge branch 'master' into staging