Merge "Configure build file" into udc-qpr-dev