BETA_JAVA7 - Committing all changes for R3_7_maintenance merge
7 files changed