WELD-1791 Second attempt