diff --git a/definitions/mars/grib.dacl.pb.def b/definitions/mars/grib.dacl.pb.def
index 1f178e5c7..f45a6b633 100644
--- a/definitions/mars/grib.dacl.pb.def
+++ b/definitions/mars/grib.dacl.pb.def
@@ -1,9 +1,17 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.dacw.pb.def b/definitions/mars/grib.dacw.pb.def
index 2e95b03ee..199c3f89d 100644
--- a/definitions/mars/grib.dacw.pb.def
+++ b/definitions/mars/grib.dacw.pb.def
@@ -1,9 +1,17 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.eefo.pb.def b/definitions/mars/grib.eefo.pb.def
index 2e95b03ee..199c3f89d 100644
--- a/definitions/mars/grib.eefo.pb.def
+++ b/definitions/mars/grib.eefo.pb.def
@@ -1,9 +1,17 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.eefo.pd.def b/definitions/mars/grib.eefo.pd.def
index 1f178e5c7..f45a6b633 100644
--- a/definitions/mars/grib.eefo.pd.def
+++ b/definitions/mars/grib.eefo.pd.def
@@ -1,9 +1,17 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.eehs.cd.def b/definitions/mars/grib.eehs.cd.def
index 5ef03fc33..f7f56e368 100644
--- a/definitions/mars/grib.eehs.cd.def
+++ b/definitions/mars/grib.eehs.cd.def
@@ -1,8 +1,16 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  alias mars.quantile = quantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.efhs.cd.def b/definitions/mars/grib.efhs.cd.def
index 45127bd73..4b21a4b3f 100644
--- a/definitions/mars/grib.efhs.cd.def
+++ b/definitions/mars/grib.efhs.cd.def
@@ -1,8 +1,16 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  alias mars.quantile = quantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.enfo.pb.def b/definitions/mars/grib.enfo.pb.def
index 2e95b03ee..199c3f89d 100644
--- a/definitions/mars/grib.enfo.pb.def
+++ b/definitions/mars/grib.enfo.pb.def
@@ -1,9 +1,17 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.enfo.pd.def b/definitions/mars/grib.enfo.pd.def
index 1f178e5c7..f45a6b633 100644
--- a/definitions/mars/grib.enfo.pd.def
+++ b/definitions/mars/grib.enfo.pd.def
@@ -1,9 +1,17 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.mfam.pb.def b/definitions/mars/grib.mfam.pb.def
index e0f0e5686..afd37fd61 100644
--- a/definitions/mars/grib.mfam.pb.def
+++ b/definitions/mars/grib.mfam.pb.def
@@ -3,11 +3,18 @@ alias mars.origin = centre;
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
 alias mars.fcperiod = forecastperiod;
 
-if (edition == 1){
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.mfam.pd.def b/definitions/mars/grib.mfam.pd.def
index 4d3b5fcb5..f62e1b00b 100644
--- a/definitions/mars/grib.mfam.pd.def
+++ b/definitions/mars/grib.mfam.pd.def
@@ -3,11 +3,18 @@ alias mars.origin = centre;
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
 alias mars.fcperiod = forecastperiod;
 
-if (edition == 1){
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
  alias mars.quantile = marsQuantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.supd.an.def b/definitions/mars/grib.supd.an.def
index f3c404405..f95e2a6ac 100644
--- a/definitions/mars/grib.supd.an.def
+++ b/definitions/mars/grib.supd.an.def
@@ -12,7 +12,7 @@ if (class is "od") { alias mars.origin = centre; }
 # Special rule for Grib 2 local definition 11:
 # Key "centre" should be set to ECMWF and key "originatingCentreOfAnalysis"
 # should be the original centre
-if (editionNumber == 2 && localDefinitionNumber == 11) {
+if (gribEditionNumber == 2 && localDefinitionNumber == 11) {
   alias mars.origin = originatingCentreOfAnalysis;
 }
 
diff --git a/definitions/mars/grib.wees.cd.def b/definitions/mars/grib.wees.cd.def
index 45127bd73..4b21a4b3f 100644
--- a/definitions/mars/grib.wees.cd.def
+++ b/definitions/mars/grib.wees.cd.def
@@ -1,8 +1,16 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  alias mars.quantile = quantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }
diff --git a/definitions/mars/grib.wehs.cd.def b/definitions/mars/grib.wehs.cd.def
index 45127bd73..4b21a4b3f 100644
--- a/definitions/mars/grib.wehs.cd.def
+++ b/definitions/mars/grib.wehs.cd.def
@@ -1,8 +1,16 @@
 alias mars.step     = stepRange;
-if (edition == 1){
+
+if (defined(editionNumber)){
+ transient gribEdition=editionNumber;
+}
+if (defined(edition)){
+ transient gribEdition=edition;
+}
+
+if (gribEdition == 1){
  alias mars.quantile = quantile;
 }
-if (edition == 2){
+if (gribEdition == 2){
  meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
  alias mars.quantile = marsQuantile;
 }