Added bluetooth connection
Merge remote-tracking branch 'origin/2.4' into 2.4