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