Merge pull request #1123 from bcgov/feature/ns-to-gw-list-display-name

Merge pull request #1123 from bcgov/feature/ns-to-gw-list-display-name #2533