ck-3.7: merge BFS v0.427
Merge branch 'ck-3.7' into pf-3.7