WELD-1742 First attempt