LPS-38437

Hey Jim, resending you this pull. The only javadocs change is still in that last commit. Please take a look at it. Thanks, Zs.