beacon update
Merge commit 'b556810'