Merge pull request #1100 from tobiasd/20210420-it