Merge branch 'hotfix/incedents'
Небольшие плюшки и фишки
Merge branch 'hotfix/dashboard' into develop