ЗИТ 3170
Merge branch 'zit3096' into dev