- Merge upstream bugfixes