Updating License information
Merge branch 'master' into cli
Updating License information