[GHC] Batch modify: #11819, #12939