#824 - Provide the ability to override resolved templates in modules