Merge commit '94710cac0ef4ee177a63b5227664b38c95bbf703' into all-v4.18

Merge v4.18-final