Merge branch 'sunny/seeding' into scott/sign_block