Patch-3.1-hunter-changes