Merge "Remove unused paramater to finish" into udc-qpr-dev