[Core] Fixup after merge