Merge "Add DISABLED_OPTIONAL_FEATURES property"