Updates for Kudu
Merge pull request #1081 from timamm/working0322

Updates for Kudu - Issue #1080