Removed lazy scala-java code conversion.
Merge branch 'testing'