Clean up and combine the last 2 pull requests