Hotfix for string of zerios on class portfolio pages
Merge branch 'master' into Development