Applied #9157, #9118, #9105.