Merge branch 'bbk'
basic
minor
Merge branch 'master' into bbk