Fixed issue TRUNK - 4006, Cannot Unretire retired Encounter Types