8.0 Integration.
8.0 changes for new added files
Merge pull request #2 from bys-alan-hu/Integration

Merge 8.0 Integration to master