Merge "Updates/Fix on Legal/License Headers"