Merge "Change how we calculate system size." into oc-dev