Merge "Dedup apex-scanning" into main