DRILL-1110: WIP