IDManager fixes for restart scenario