The change restore the implementation in 'master' before the merge of 'hive'. Fixes GAUDI-1166. See merge request !97