Merge branch 'scaling_bug_fix_usan_fix' into 'main'

Scaling fix in find target and usan error fix [allow regression]

See merge request !1357