Merge branch 'eclipse_3_7' into integration
Merge branch 'integration' into eclipse_3_8