Merge pull request #8480 from BKPepe/multidict