[master] + fix findbugs issues