Larger features beyond 2.x.
Breaking-change release from the 2.x branch: consolidation plus the feature requests filed for it.