Merge branch 'bash' into flipper