Verify working in 3.5.1
Update licensing