Cherry-picked two commits from master e57920b and 0ecd1ca to update the kernel 3...