Attached a diff generated from the shelved change. This was made against the latest code in Dev-Networking.