Merge "Fix Path_Delegate reset"