#627 added support for beacon insert wait

Resolves #627