IDEX-1097 remove CoreModule
Merge remote-tracking branch 'origin/master'