Merge "Migrate to best practise to read network state" into main