Idex-732

@evoevodin @mshaposhnik @skabashnyuk @gazarenkov 
Please, review my changes