Merge pull request #10094 from urbalazs/license-20210328