Merge pull request #10158 from tobiasd/20210420-it