LPS-43645 Remove double escaping
LPS-43647
LPS-43649
WIP