Merge "IDManager fixes for restart scenario"