Merge "Change comments for numActiveSlots"