LPS-34383

Hi Julio,

I've merged your changes, adjusted and tested them and squashed all the commits into final  one (I think it's better then to have 4 commits for this simple change). 

I'll close the original pull request as well.

Thanks for your review,
Josef