Fix FindBugs
Merge branch 'multi-project'