Merge "Fix NPE" into udc-qpr-dev