Merge remote-tracking branch 'remotes/origin/main' into basop-2308-optimisation-of-find-target