Merge pull request #20709 from colemanw/api4CleanupBridgeJoinable