FIX: [aml;pivos] Fix 1080 on MX
Merge pull request #5987 from koying/fixaml1080