references shortened
Merge branch 'Artem-branch'