Merge pull request #9208 from tobiasd/2020.09-creadits