#3521 for master ee.jar