fixed merge, added cluster service updates