Merge branch 'bridge_default_pvid'