PR #1399 - beam-cloud/beta9