LPS-31740

Hi Jorge, 

please forward this pull request to @epgarcia. 

It contains also contains one commit with Javadoc for @jhinkey.

Thanks,

Josef