Merge branch 'cb/setup' into next