GCP-6253 : Added checking against name synonyms of PSM combo
Merge remote-tracking branch 'origin/master'