Merge commit '6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c' into
mini-v4.12

Pull v4.12-final.