Merge pull request #24187 from colemanw/removeCiviAuction