Fixed license port
Merged release changes