Merge "Fix null object reference" into udc-qpr-dev