Fix 850: Use new templates and fix issue in writer
Merge pull request #855 from mvriel/850

Fix #850: Use new templates and fix issue in writer