LPS-51693

@brandizzi, could you please do some manual tests?

Thanks