WELD-1791 Next attempt