[[ Merge-6.7.0-rc-3 ]] Removed core.h references added by the merge