[Cherry-pick] pick from main to 1.11 for release 1.2.6 #196

Closed banmoy closed 1 year ago