First steps towards supporting cancellable reservations (#319)