Upgrade Grizzly 2.3.6, as expected by AHC 1.7.21