Cherry-pick recent security fixes #1029

Closed vgao1996 closed 1 year ago