WELD-1775 Next attempt