Merge pull request #21424 from colemanw/apiJoinBridgeCustomFields