Merge "Strict-related commands porting"