Merge changes provided by the team at Intel for CC-NG support.