WELD-1659 First attempt