Container SPI - Grizzly 2.3.5 -> 2.3.6