#1880 and updated license headers