Merge branch 'feature/split-hide-network-v2' into 'develop'