Merge "License agreement changes"