Merge "Merge bluetooth branch into master"