Merge: Jwrapper: Fix bug with nested classes