Update to NRC config and layer group changes.