LPS-29148

Hi Norbi, could you please test my changes? Thanks, Dani