Catch up with upstream NetworkConfigPlugin