The license addition should be in a different pull request from the EMC fix