VOLDEV-11

[VOLDEV-11](https://wikia-inc.atlassian.net/browse/VOLDEV-11)
@Grunny @mroszka