WIP upgrade to v61
Completed first version of upgrade v61, dashboard is not installed as part of the upgrade