[JBTM-1970] Changes to support version 7.1.0.Final of the SPI