Merge branch 'beamsearch_batch' into develop

2 jobs for develop in 7 minutes and 50 seconds (queued for 2 seconds)