Merge origin/main into issue-1464: resolve conflicts keeping explicit prefilter + updated threshold

Co-authored-by: brendancol <433221+brendancol@users.noreply.github.com>

Author: Copilot