DRILL-793: WIP