Fixes GAUDI-1102
this merge is needed to maintain functionality in both Hive and vanilla Gaudi branches.