wzg 修复#6432，#6634 , #6062 , #4979