add license info
merge with mainline