WP-3861: Update features and remove overrides.