[1.8.x] + integrate Grizzly 2.3.13