Merge branch 'bridge_8021AD'