LPS-50685 Changes to escape is not needed