Merging core-refactor aftermath