Merge "Allow null fill values to support authentication case" into oc-dev