1) Some inheritance issues resolved (HiveClient)
2) Duplicate authentication request removed
Merge remote-tracking branch 'origin/master'