GMR-172: restore fix to GAUDI-1018 removed by a875c69e
apply Gaudi Merge Request 172: gaudi/Gaudi!172 (merged)
restore fix to GAUDI-1018 removed by a875c69e
apply Gaudi Merge Request 172: gaudi/Gaudi!172 (merged)
restore fix to GAUDI-1018 removed by a875c69e