Merge pull request #4023 from senivam/EE4J_8_RC4

fix for #4022