Merge "Loosen resource file verification" into pi-dev