Merge "removing rib per node configuration"