Merge branch 'version3.0' into SidneyFan
Delete material
Merge branch 'SidneyFan' into version3.0
Merge branch 'version3.0' into MaggieHe