Fixes: #1887 First template system draft