This merge requires conflict resolution, since some functions' names are changed, and the function bodies are updated, and many new functions are added

[davebraze]

Hi Tao, I need you to resolve the conflicts and only then resubmit the pull request.