LPS-43264 fix test-sample-sql.
LPS-43424 Edit Javadoc
LPS-43617 Regression fix