Merge pull request #1336 from dougbtv/net-attach-def-client-v173

Merge pull request #1336 from dougbtv/net-attach-def-client-v173 #20