IKASAN-691 - provide support for i7 and i8 JMS compatibility