IDEX-278

@vparfonov Please, view my changes.