CLSN-1267 code review - till 17 Aug
 no templates for type number, settlement