Fix findbug issue.
Merge remote-tracking branch 'origin/stable-develop' into develop