DRILL-1905: WIP