Fix build errors related to QString
Merge remote-tracking branch 'origin/develop' into PAT-EC2