ISPN-3276 Support the new Store SPI
ISPN-3392 Workaround usage of deprecated API by the security subsystem