3.31.2
======
* Port away from and remove ShellGenericContainer [Georges; !153]