BugHunt more functions
Merge commit '5731154d0cad3945a15516c804bd596151bed486' into BugHunt