Merge pull request #1299 from wojnilowicz/main