Changing function used to escape instead of stripping
Merge branch 'release-140-bugid-94742' into release-140