Merge pull request '#2563，#2586  继续完善。' (#2681) from zouap into V20220815