No findbugs issue left. Removing unnecessary suppress.
Merge remote-tracking branch 'origin/master'