Java improvements from preprocess rewrite
Merge branch 'develop' into feature/gen-list-debug-filter