Grizzly 2.3.17 migration for GRIZZLY-1707 issue