[Core] More work on merging in code