Fixes for remove trip/booking handling.
Merge remote-tracking branch 'origin/develop' into develop