[TECHNICAL-SUPPORT] LPS-47192 Passed test + SF

Hey Julio,

I have tested your changes and added some changes to fix TemplateException, plus, sorted the arguments. I also fixed the typo in your commit message.
Please, forward it to Brian if you like the current state.

Regards,
Tibor