[Cherry-pick] pick from main to 1.13 for release 1.2.6 #198

Closed banmoy closed 1 year ago