wb-505 update hive 0.9 branch to match current version