Merge branch 'develop' into lbudginas/#436_tooltip_for_hive_values