hive-4343- changes while testing