Merge "Add config to artificially inflate number of bars" into oc-dr1-dev