CDB-565 #comment Ensure template is rendered