Merge "Fix crash of resource not found (1/2)" into udc-qpr-dev