Merge release-1.23 patch to develop -- 	 Remove the redundant URL encoding