Removed double decode which crashes windows
Merge branch 'dev' into ms