This fixes #8161.  All of the templates are now in place.