Region overrides implies environment=prod

1 files changed, 2 insertions, 1 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
index 1e77ad1a8f7..c1a3b75c3a1 100644
--- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
+++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java
@@ -120,7 +120,8 @@ class OverrideProcessor implements PreProcessor {
             Element child = elemIt.next();
             Optional<Environment> env = getEnvironment(child);
             RegionName reg = getRegion(child);
-            if ((env.isPresent() && !environment.equals(env.get())) || (!reg.isDefault() && !region.equals(reg))) {
+            if ((env.isPresent() && !environment.equals(env.get())) || 
+                (!reg.isDefault() && (!region.equals(reg) || !environment.equals(Environment.prod)))) {
                 parent.removeChild(child);
                 elemIt.remove();
             }