LPS-44347 SF

Please, remove the two commits we agreed on. I haven't done it becasue I got conflicts. \\n Note: I haven't reviewed or run the tests