Fixes issues with default data loading
Merge branch 'hotfix'
Updated Version 3.5.010
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature