merge latest cosmos-hive-0.11.0