ck-3.16: an attempt to fix i8k+BFS
Merge branch 'ck-3.16' into pf-3.16