Bug 9307: Split features to avoid incompatiblities