Merge pull request #10756 from haskell/wip/teo/T10537