Migrated update code from 4.5.beta5 to 4.6.alpha1