1.9 backport cluster stuff