bugfix cherry-pick for DRILL-54

as title.