[core] updates required for latest core merge.