JBIDE-16593 - updated so it applies to soa-5.x