[3.8] Fix client template