Merge pull request #8812 from tobiasd/2020.06-credits