backport v3.3.8 kernel