Merge 2 pull requests