Merge pull request #973 from moritz-makandra/main