Adding configurable value for max OER
Merging v5