Merge "Add NB capability to save configuration"