Merge "Remove misleading diagnostic" into pi-dev