Merging with Paradox21 pull requests