#3521 for master-2.5 ee.jar