Merge commit '3f434566' into kraken * commit '3f434566': Clean up SearchableInfo API, JavaDoc and formatting