IDEX-711: aplly changes from ide/master