Merge pull request #16483 from seamuslee001/utf8mb4_min