closed #206
Merge branch 'feature/206-pnr-nbz-whitelist' into dev