Merge branch 'feature/private_network' into develop