LPS-43690

cc: @LeventeHudak