Merge "Stable Branch for Hunter Release"