[Git][ghc/ghc] Pushed new branch wip/apk/o2-map