Prep for new machine setup#23

selfcontained merged 3 commits into

mainselfcontained/dispatch:mainfrom

prep/new-machine-setupselfcontained/dispatch:prep/new-machine-setupCopy head branch name to clipboard