Merge "Detect paths without lunch." into pi-dev