merge cluster fixes from release_2_0 branch