Merge "Fixed errors after updated ag/29186008" into main