Merge "NSB Prox minor refactor of BNG"