Merge "Add back compat config for NSD"