better bar beacon management
Merge remote-tracking branch 'origin/master'
better bar management