DRILL-1007: WIP