[#861816] Updates to prepare for changes in MakeAPI.