Created by: Superjomn

This is the last PR that sync the internal code to github.

We will keep developing on the Github latter.