Merge branch 'feature-network-api' into develop