Patch-4.1-hunter-changes