repo: don't require option when template_path is specified#6983
Merged
repo: don't require option when template_path is specified#6983
template_path is specified#6983