WELD-1787 Minor