General clean up.
Merged from GitHub and then did general clean up.
Merged from GitHub and then did general clean up.