scala 2.9.x support
refactoring
typed fix
Merge branch 'develop'
5.3-M6-SNAPSHOT