ck-3.16: merge official 3.16-ck1 with BFSv450
Merge branch 'ck-3.16' into pf-3.16