merge Hive 136 to master