WELD-1728 First attempt