Merge branch 'feature/fix-findbugs-warnings' into next