Merge pull request #16560 from daffainfo/patch-416616