LPS-43645 Remove double escaping
LPS-43647
LPS-43649
LPS-43653
LPS-43655
LPS-43656
LPS-43658
LPS-43659
LPS-43660
LPS-43662
LPS-43664
LPS-43649
LPS-43662
LPS-43662 - Service Builder
WIP