hacky try#175

jhheider wants to merge 2 commits intomainpkgxdev/setup:mainfrom

trapped-double-runpkgxdev/setup:trapped-double-runCopy head branch name to clipboard