Merge pull request #10115 from tobiasd/20210402-credits