NXP-11820: fix management of empty values for variables in templates