Merge branch 'bmx6_testing' into bmx6_testing_new_config