Merge "Fix missing null checking" into oc-mr1-dev