First commit on user-net-dev branch