Sweeping !15867 from 21.3 to master. Fix matching of merged NSW PRD to SDO See merge request atlas/athena!15924 Former-commit-id: f310eea7