Merge branch 'version3.0' into SidneyFan
Code Reconstruction
Merge branch 'SidneyFan' into version3.0