JBIDE-13690 portion for eap6.0-based products