IDEX-706, IDEX-811: Rework project tree
IDEX-706, IDEX-811: Rework project tree
Merge branch 'IDEX-811' into AppContext