WELD-1550 Backporting fix