Backport fixes to branch-51#61

ahmed-mez merged 8 commits intobranch-51DataDog/datafusion:branch-51from

branch-51-testDataDog/datafusion:branch-51-testCopy head branch name to clipboard