PRs for Drill 1.14

[Charles Givre]

Hi Boaz, 
I just submitted a PR which should be relatively easy to review, but I’d like 
to get it into 1.14.  It is DRILL-6519.
Thanks,
— C