PR #1386 - beam-cloud/beta9