Merge combo-IP fixes to use the new API