back merge from main: fix codes #2

Closed yebin-yu closed 7 months ago