Merge "Ipfwd-related commands porting"