fixes #8477 - make templates distributed by default