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