Commits for DRILL-234 and  DRILL-233