Merge "Nat-related commands refine"