Merge "interface-related commands porting"