templates for fork 3.7

port of the templates of 3.6 to 3.7