Merge "Remove unnecessary network policy rules bookkeeping" into main