Merge "Fix to usage of upper bound value in volume curve" into nyc-mr1-dev