LPS-40826 Properly handle @Clusterable processing from SPI
LPS-40826 SF