IDEX-1323

This pull request should be merged after merging corresponding pull request in ide project