Fixes GAUDI-1171 See merge request !109
mentioned in merge request !113 (merged)
mentioned in commit 3fbae469