Fix issues with cherry-pick and merge from Havana Horizon