Merge "Fix error in Booking cleanup task"