Merge "Fix a type conversion bug." into udc-qpr-dev