Allow skipping of template auto-assigns, closes #605