Previos commit (80d9613662e8ec6a7ac8ae1e7d59810b06e11def) fixes
posterior syncs due to changes for kernel, too.