[DF-1904] Fix TemplateProject for iOS
DF-2019 small interface fixes
Merge branch 'to_master' into to_master_qa