[modify] RBooking
[modify] manager function
Merge remote-tracking branch 'upstream/master' into jdbc