Merge pull request #8709 from BKPepe/license