BATCHEE-148 upgrade to EE8
12 files changed