Merge branch 'network' into hqs