Merge "Fixes nic template rendering"