Merge "Make linter message clearer." into udc-qpr-dev