Initial port from 2.3 to 3.0.
Merge branch 'master' of https://github.com/GTCGroup/soaj-testing.git