IDEX-1370 rework new project wizard
Merge remote-tracking branch 'origin/master'