Fixed to support latest BEaST
Merge remote-tracking branch 'origin/develop' into develop