BEAM-934: fix
(cherry picked from commit ac8f419)
Merge branch 'master' of github.com:bcdev/beam