Merge "fix licensing issue"