Merge branch 'scott/sign_block' into sunny/seeding