Merge branch 'gallium-index-bias'