Merge branch 'MaggieHe' into version3.0
Merge branch 'version3.0' into MaggieHe