Prepare for grouping of trip options (with interim 3.1 release)