Merge branch 'bkl/drivers' into auto-bkl-next