Merge "Don't populate a setting instead of defaulting to 0 when not set." into oc-dev