Decode URL for proxy WS.
Merge remote-tracking branch 'origin/Hotfix' into develop