fall back to default instead of overridden null value
fall back to default instead of overridden null value

dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq