Merge branch 'kernel-test' into seventeen