Upgrading 2.3.35 to 2.4.11 - best approach?