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