Merge "Add logs to determine if grid positions incorrect" into udc-qpr-dev