fixes #8104 fix postal code exclusion for specific location type
Merge branch 'dev' into test
Merge branch 'test' into prod