Issue #8204 by tuj: Included templates in client.