Merge pull request #2181 from spnethw/fix-1745-multiarc-changes