LPS-31936

Here is the branch that I had problems rebasing on a .jar