Merge branch 'ble' into discovery