Merge branch 'gallium-noblocks'