fixes for student tenant show
Merge branch 'master' into development

Master Merge