Comments in ReservationMgrServiceQuery
Merge origin/master