Merge pull request #1043 from jkczyz/2021-07-network-update-handler