Fix core release build
Merge pull request #5842 from ctomc/core

Fix core release build