Revert "Merge branch 'bmx6'"