Merge #3400: kernel updates

(cherry picked from commit 33e4a7f6232c6ec17cd31370f453e704f949fea6)