LPS-32484 Fix compile
LPS-32484 Better fix
LPS-32484 JavaDocs
LPS-32484 Simplify
LPS-32484 JavaDocs