Bug-2230: RSVP plugin integration