Idex 741

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