Merge "am:fix the dead lock." into main