BATCHEE-148 upgrade to EE8