--License related changes

TESTED: N/A
OTS: Guy