LPS-33278

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