New module: core
Merge branch 'feature' into develop