LPS-44479

Hi Eduardo,

this is needed for having a safe backport of LPS-43781.

Thanks!