Attempt 3.5.0 upgrade