fix: apply bug fixes via upstream libs update (#4339)

fix: apply bug fixes via upstream libs update (#4339) #1037