Merge branch 'bmx6_testing_new_config' into bmx6_testing