Merge branch 'use_arrow'