Fixed None display in collections
Merge branch 'refs/heads/hotfix-collection' into develop
Merge branch 'refs/heads/develop'