Fix extra template loading (#40455)

Commit

111 days ago

Fix extra template loading (#40455) * Fix extra template loading * Reformat * Trigger tests