Merge "[ML27.1] Allow adding additional features to other settings"