JBEE-121 - updates for EE 7