Merged in license cleanup from v1.65