Adding last ros6 fixes to ensure we don't get divert conflicts.