build core/ successfully
Merge remote-tracking branch 'origin/refactoring/core' into refactoring/core