WELD-1623 Backporting fix