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