Merge "Use -1 to indicate permanent disable"