Merge and fixup Pull Request