Copy missing templates from 2.1 branch