CDB-565 #comment Ensure template is rendered
Merge remote-tracking branch 'origin/bug/CDB-565' into release/2.6.0