Bringing back in the new parser changes to the template file.
Bringing back in the new parser changes to the template file.

PeterRock/Ci-Bonfire3,PeterRock/Ci-Bonfire3,PeterRock/Ci-Bonfire3,kelaskakap/cms-api-unggun,kelaskakap/cms-api-unggun,kelaskakap/cms-api-unggun