Upgrade Grizzly 2.3.4, close #1300