Merged with [aa519dbd99].