Merge "Add feature flags in config to enable tests conditionally"