Update cluster partition handling logic