AEP_4.2.0d - Update for April 19 Patch