The portion of the JBEAP-19148 fix that touches the MP subsystems needs to be ported to the xp-3.0.x branch, plus applied to the new MP subsystems and to those that were moved out of base EAP for 7.4/XP3.