Merge pull request #1115 from harmathy/main