Merge branch 'fix/hide-network-setting' into 'develop'