Merge pull request #516 from TheBlueMatt/2020-02-checkin-arch