Merge "Fall back to checking packages if one is not provided" into pi-dev