*8922* Avoid repeating default template name endlessly
*8922* Submodule update ##asmecher/8922-fix##