Update #9 for FindBugs
Merge commit '7186c67841882b125267a81e4cf0faaa97cc3d41' into HEAD