testing
Merge remote-tracking branch 'origin/CON-33-News1' into CON-33-News1
Cleaning up unicode stuff
Merge remote-tracking branch 'origin/CON-33-News1' into CON-33-News1