[weld-dev] Workaround for error code : WELD-001435