core-refactor merge