[Git][ghc/ghc][wip/T23162-spj] 13 commits: Resolving issues #20645 and #26109