Integration

roll up other pr's