Merge "Add client package name to WTF message"