Comment on Claro: Refactor template as #3010558 is fixed