IDEX-1051
Merge branch 'master' into new_tree