Merge pull request #6928 from remitamine/cnet