update
update
Merge branch 'HIVE-5358' of github.com:MTDATA/hive into HIVE-5358