WIP for DRILL-1421