simplified the AMD example
Merge branch 'master' into next