[minor] Progress on automatic template render support