Merge commit '569dbb88e80deb68974ef6fdd6a13edb9d686261' into
mini-v4.13

Pull v4.13-final