[T6886] Fix no partial order and validate origin picking.

Merged Joel Maglioni requested to merge T6886 into 17.0

Merge request reports