Merge pull request #4876 from Cynthia-0203/fix/template-library-render-validation