Upgrade failure going from 3.x to 20.2.1+