Backwards-compatible features and enhancements. Merge only after 4.0.1 is tagged, so 4.0.1 stays fixes-only.