Apply additional fix for AME-5261