[Core] Fix build error after merge