Changed groupinstall Core with base
Merge branch 'dev'