Merge pull request #18584 from mpratt14/golang-bootstrap-arch