Fixing typo
Merging branch 'development' into ios
Cleaning up and porting changes from development branch into ios