URL Encoder fix
Merge remote-tracking branch 'origin/master' into sita
URL Encoder fix