Merge "Nat-related commands porting"