basop-2308-optimisation-of-find-target [non-be][rend-non-be][split-non-be][allow-regression] See merge request !2689