Changes supporting core-firmware changes