Kernel update (17/19)

Kernel update