Merge "Fix license issue" into devel/master