bug fixes in templates

Aleksandr Kurbatov requested to merge feature/nat-487-bfd into develop Mar 21, 2024