Merge branch 'jn/setup-fixes'