[JBJCA-1178] Performance improvement to SALMCP