Merge branch 'lr/git-run-setup-gently'