Merge "Improve search for available spill slots in RA"