LPS-42077 - fix test failure
LPS-42158 Undo LPS-24255