Merge remote-tracking branch 'refs/remotes/origin/Update_license'