LPS-43689

cc: @LeventeHudak