AEP_4.4.5 - Fix for WW - May 7, 2020