US534&US537: fixed issues with special characters
Merge remote-tracking branch 'origin/development' into development