Add. Template. issue1017, issue1020, issue1021