4.1 dev

Adjustments for set combines.