Merge phase 1 support for the new bridging architecture.