WIP for drill-1707