Merge pull request #1 from cjolif/master

refs #17184. Fixes regression by making sure the AMD port is correct.
Merge remote-tracking branch 'upstream/master'