Merge branch 'hotfix/control-subnet'
Fix issue with changing the subnet of the management network