apply Gaudi Merge Request 206: gaudi/Gaudi!206 (merged)
fix tests failing after gaudi/Gaudi!178 (merged)