[weld-dev] Follow up to WELD-2611