Removed additional person fields from DESCRIPTION and small optimizations.
Merge branch 'hotfix-0.3-5' into develop