Merge "Fix a typo" into udc-qpr-dev