Merge "Find graceful description when missing disk." into pi-dev