LPS-31740 take 3

Hi Juan,

hope I did everything like you wrote, I was battling with Git a little since I don't use its advanced commands very often.