Changed BusLocked to public
Merge branch 'dev' into touch