Merge the test branch into the default branch

将测试分支正式并入标准版本中
实装相关内容

Officially merge the test branch into the default branch