[GitHub] drill issue #1163: DRILL-6053 & DRILL-6237

[vrozov]

Github user vrozov commented on the issue:

    https://github.com/apache/drill/pull/1163
  
    @arina-ielchiieva Addressed review comments. Please keep both commits (do 
not squash) during the merge.


---