WELD-1658 First attempt