ARW-620 fixes
Merge pull request #1 from nikolay-saskovets/feature/cons

ARW-620 fixes