Merge pull request #19825 from colemanw/api4BridgeJoinSubquery