#615: Cluster manager crash

This is still occurring regularly for me, even after today's code update.