Merge branch 'net-bridge-minor-followup-optimizations'