WELD-1756 First attempt